From 54d9b4001573a50844946d2acbbd1e62cd95db25 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@imendio.com>
Date: Tue, 3 Jun 2008 08:38:59 +0000
Subject: [PATCH] gtk/gtkclist.h revert includes to how they have been before
 the

2008-06-03  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkclist.h
	* gtk/gtkctree.h: revert includes to how they have been before the
	GTK_DISABLE_SINGLE_INCLUDES changes. Apparently I missed the fact
	that you can't include <gtk/gtk.h> from two headers where one is a
	parent class of the other and expect them both to be includable
	individually.


svn path=/trunk/; revision=20302
---
 ChangeLog      |  9 +++++++++
 gtk/gtkclist.h | 13 ++++++++++---
 gtk/gtkctree.h |  4 ++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 60c4091ebb..576d03fbf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-03  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkclist.h
+	* gtk/gtkctree.h: revert includes to how they have been before the
+	GTK_DISABLE_SINGLE_INCLUDES changes. Apparently I missed the fact
+	that you can't include <gtk/gtk.h> from two headers where one is a
+	parent class of the other and expect them both to be includable
+	individually.
+
 2008-06-03  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkprinteroptionset.h: remove newline at beginning of file.
diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index 9744119b71..06cbf66ef9 100644
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -22,7 +22,7 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef GTK_DISABLE_DEPRECATED
@@ -30,7 +30,14 @@
 #ifndef __GTK_CLIST_H__
 #define __GTK_CLIST_H__
 
-#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtkalignment.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkhscrollbar.h>
+#include <gtk/gtkvscrollbar.h>
+#include <gtk/gtkenums.h>
 
 G_BEGIN_DECLS
 
@@ -48,7 +55,7 @@ enum {
   GTK_CLIST_USE_DRAG_ICONS      = 1 <<  8,
   GTK_CLIST_DRAW_DRAG_LINE      = 1 <<  9,
   GTK_CLIST_DRAW_DRAG_RECT      = 1 << 10
-}; 
+};
 
 /* cell types */
 typedef enum
diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h
index 5d4ea5f9e5..e9cabffa7c 100644
--- a/gtk/gtkctree.h
+++ b/gtk/gtkctree.h
@@ -25,7 +25,7 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef GTK_DISABLE_DEPRECATED
@@ -33,7 +33,7 @@
 #ifndef __GTK_CTREE_H__
 #define __GTK_CTREE_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkclist.h>
 
 G_BEGIN_DECLS
 
-- 
2.30.2